From 6e3fd6a74dff25c82fb0de126289de31bbb1e381 Mon Sep 17 00:00:00 2001 From: "fred@localhost.localdomain" Date: Thu, 28 Jul 2005 07:33:34 -0800 Subject: [PATCH] Make ns16550 rework on tiger4 box Signed-off-by Kevin Tian --- xen/arch/ia64/pcdp.c | 8 ++++---- xen/arch/ia64/xensetup.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xen/arch/ia64/pcdp.c b/xen/arch/ia64/pcdp.c index cab5eb2ff5..9cae51129a 100644 --- a/xen/arch/ia64/pcdp.c +++ b/xen/arch/ia64/pcdp.c @@ -24,11 +24,11 @@ static int __init setup_serial_console(struct pcdp_uart *uart) { #ifdef XEN - extern struct ns16550_defaults ns16550_com1; - ns16550_com1.baud = uart->baud; - ns16550_com1.io_base = uart->addr.address; + extern struct ns16550_defaults ns16550_com; + ns16550_com.baud = uart->baud; + ns16550_com.io_base = uart->addr.address; if (uart->bits) - ns16550_com1.data_bits = uart->bits; + ns16550_com.data_bits = uart->bits; return 0; #else #ifdef CONFIG_SERIAL_8250_CONSOLE diff --git a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c index f27bedf0e2..8553e2bcf4 100644 --- a/xen/arch/ia64/xensetup.c +++ b/xen/arch/ia64/xensetup.c @@ -130,7 +130,7 @@ void early_cmdline_parse(char **cmdline_p) return; } -struct ns16550_defaults ns16550_com1 = { +struct ns16550_defaults ns16550_com = { .data_bits = 8, .parity = 'n', .stop_bits = 1 @@ -158,7 +158,14 @@ void start_kernel(void) /* We initialise the serial devices very early so we can get debugging. */ if (running_on_sim) hpsim_serial_init(); - else ns16550_init(0, &ns16550_com1); + else { + ns16550_com.io_base = 0x3f8; + ns16550_com.irq = 4; + ns16550_init(0, &ns16550_com); + ns16550_com.io_base = 0x2f8; + ns16550_com.irq = 3; + ns16550_init(1, &ns16550_com); + } serial_init_preirq(); init_console(); -- 2.30.2